Optimization of rpi