Updated production version