Changes to ready for production