CLC-909 Design refinements round 3