Added some functions and stuff