Completed

PH_1104 for Huu only