Completed

PH_1105 for Huu only