major change on the way we treat SwitchNode. Much better now