change according to oop changes