Changed deadlines to reflect client's needs.