Make changes based on Auk's comments