Refactoring, econe compute bugfix