Moved some stuff around again