Changed dates to finale date / to be removed after