Last commit, change back to normal functional 2PC