Move some functions around