enhanced make data step with seasons etc