very old changes involving specs and bundling