Further changes to production