Changed messages & added new methods