now with more bundling