Added some functions