Tweak the build func extensions. Not happy with, will be revisiting.