changed some stuff (;