kim's changes
more changes