Node controls now in waterbear master