moved some things and stuff