Update OO part #1