Hi Rick,

I updated the code for that.
Please help me review the code again.

Thanks. :)