Update dates and working on a draft