modifications for RPM