switch some stuff around