Changes for IPF-2 (not in a branch ... whoops)