OOP concepted code addded