some oop problems added