Changed many things :P