Integrated changes from Kim on 7/6