National championship - 2011 formula

Different formula for 2011, code refactoring, comments