added some functions + updates