changed bundle structure