reordered attack2 before attack since the patterns are matched left to right
added fold markers to make this more readable/browsable
consistent headers