minor changes in regex, still not working