last changes for the production run.