Changes for New CWM