Swapped around order of init functions