Adding changes aneesh made to the code