REmoving some functions to other file