refactoring with custom bundles