Rescaling support, cleaning up