Prepare for production 2