Changed DATE's to NotNull