slightly better mechanism; maybe could expand with Custom; TODO: needs feedback from huaiyu and chris to proceed