This is Scrimmage2 --> 2.0, added some more aliases