code gen tweak