Updated to production version