Updates to engagement tool.
Merge branch 'd3test' into iss450