Changes for new cwm