added functionality for comma