changed WCtoCP and added NONE_BLOCK define to DefineSettings.h