Kim's changes