couple of changes for creating a bundle