changed a few things :P