updated patterns
all messed up... ugh.