Switched some stuff around