03-15 update by Yan and Qi