Added bonus functions and merged hitpoint functions