more upgrade-friendly