changing some stuff around