suggested changes from Noel