changed some more things