Even nicer changes, too tired to write...