Modified as per the review comment