moved some stuff around for better load time