Added RP and S and testes passed