Updated to rxJava