revised oop rps for more oop design