Incorporate feedback from @AaronLasseigne