renamed timer from foo to timer, added more regexes