committing almost production version