Commiting Aaron review comments -2