working on bundling