new version of CAD template (last update from Nils)