Some updates from Yu-Fang
Some updates from Yu-Fang