Completed

PH_1106 for Huu only