Few edits as per Vineel