Changed to the final CAD, not quite done