Added functions and TODO