Xin Zhao with new tools

Added June 5, 2018