Moved around some functions. No changes