Same as before but for production