merge to Ke's Work