RPM improvements