changes from Chameleon Pi 3.2