Incorporate feedback from Val Freedman; Renamed to include my name.