More bundle changes