Simplified solution for RPI