Some tunning for production