comments & commas added