Implemented Keyle's changes

Thanks a lot Keyle! Mypet and economy support now full!