refactor, prepare to support 2014 stats