1.16 Upgrade (Jake 2.0)