RK-2 refactoring