Rx improvements: