Update dates
Use correct condition for shift(), return early