Updated for summer 2014

Lots of numbers changed.