update for production build 1.0.16, part 2