Simplifying the sample for the new changes on the RPi.