more production mode stuff