made some updates to cwt