Take my name out of it
Use lower-case system vars, easier to type
Correct template for Byzantine arrangements