CHanges from Kai

Signed-off-by: Kai Duan <kduan@usc.edu>