Updating overloading resolution in CLS
Updating sections of CFR-1