Sync with khuang@cs.umass.edu