these are Kim's changes because auto merge was not allowed