Hi ypu, 

Have updated the code according to your advice.
And you are so careful in reviewing the code, thanks for your patience.

Thanks,
Cong