Made the date thing much shorter