Updated 18th June

Refer to the comments to see the changes