Update scan to check for commas too