Now pattern s1 and 2 accept dots and commas