merge latest code from mingyu's repo