Some fix and revert the way to generate the bundle
New EE