Changes made as per review