added better check commas