Updated Some Regexp code