Octospy refactor again