Changes in the production version