I am really busy now, it might take a while for me to review the changes. Sorry :(