Modified to conform Rx.NET