Updated Yaoqiang merge of pool 3 & 4 with correct file from W4