Upgraded production version