Added ',' and '.'