Rearange some stuff