merge with Chen