refactoring NodeUpgrader
experiments are going on OK