temporarily removed bundles, changes for windows and new mappings