incorporate fork upgrades