Incorporate feedback from Drew Neil