Add changes proposed by SD8Z