Better Architecht's Wrath handling.