more changes from Kim