Added some fuctions