inject pre-badge
refactor tweak