Integrated changes from Kim