switching some stuff around