Added some more functions to events instead of doing the same thing over and over