upgrades to work with 0.4x