I have addressed the issues you have raised. Give a look at it, please.