Some optimization of WCH features