changed some stuff here