Moved the functions around