Integrate changes from Kim