made commas optional as well