Modifications for production version