Slightly enhancements on ZCPD post