Removing the "cheating" implementation