Feature/get better dates