Chloe

Thanks, everyone for checking, I checked the changes and figured that it will take some time to update this PR. I will get back to you guys when the PR...

Hi @cond0r, this PR is updated with the latest changes, please help to review it when you have time. Thank you! c/c @zenweasel