made some changes to objects and methods