Adapted RAPI for Stage 4.1.