Changes made by Sumit