Added some of the functions