changed location of most things