scheb/two-factor-bundle suggesters (2)