add in changes from Charles Grant