changed some things :)