Changed the way HP is set up