Topic 2- Changed methods as adviced