Made agreed changes to d1 and rpi1