moved some stuff around to fit loaction