changed some stuff around