Update OO part #2