Adjusted to add data from 2 years back per Will C request