Added some functions
Added some more functions on branch