Made suggested changes from Charles