applied some of the fixes made in the CDC version to the full journal version