fix date shift
use preliminary estimate for PIs
improve performance