Put some functions in the right place