Revert back to zwaldowski version