nodatk

Thank you for your review and comments. I fixed them, please check agin.

@fauxpark Thank you for your review. I fixed them, please check agin.

@fauxpark Fixed again!

What is the status of this PR? If it has no more problem, please merge to the master.