more updates to CWT