changed some things :P