Updated and improved bundling