Updated Elements of the 2016-2021 TIP