changed some stuff i think