CLS proper implementation; merging in router