Altered to include current month data