Upgraded to RX 1.0
Refactoring
Refactoring