made some updates for kim's work