CLS Redesign