changed location of some stuff