Added functions from work