tweak wrapper and regen