Add Octonode back in