Improving the rpi.h.