Add modified version of cwm