updated for production version 1.0.10
updated for production version 1.0.10, part 2