2021 APP INFRA, revised