production mode additions