Revamped CAD and new screens