Changes made on comments