merging Sunny Huang's changes