Re-worked due dates and times