More RPM-ification