changes for final production version