Implement changes from Chris Nammour's email of August 14th