Changes to production code