update for production build 1.0.17, part 3