More (final, I hope) rules changes