added matchers and time formatting