Changes on Homework 2 OOP