improve bundles laziness