Tweak again for production