working on adding patterns
working on adding patterns
fixed merge errors