added a bit of Rx