moved some stuff around so it made more sense