Updated cad set-up