Small update to production logic