Revised on 01/2022 (update to standard NOE and PFE)