More Patterns replaced