Added solution for RPI