making kiri's changes
Integrate Kiri feedback