Yes,  very good comments, thanks for reviewing.
Will update it in PATCH V4

Regards,
Daoxiang