mdp.Node replacement, take 2