added oS 13.1
folded pattern matching code