Added rest of functions