Incorporate feedback from @gabebw