add more patterns
clean up