Changed methods as adviced