(RP) Kestrel 2020 Upgrade