Updated to work with data from 2014