CAD-16 more changes