replaced "indexOf" with "match"
placeholder for regEx
removed # from each and all vars