Moved some stuff around