Moved some stuff around during load.