Changes to account for new error distribution and generation scheme.