better re-bundling?