Finished Anthony's pull request corrections