changed some stuff :D