changed the order, hopefully fix spawns