PRODUCTION VERSION 2.0