Update jlzhu's work log 6.17