after suggestions by muon POG