Changes made as per the previous comments