Wip/rpm enhance