incorporate feedback from Jeffrey (Zhaohui) Zhang