HIG - incorporate feedback from Michael Catanzaro