Added functions + comments