Fixed dates and added highlights