Changed oop pattern