shyanfeng part merge with maintainer james