Decision fix

Better managment of the dates.