integrate Kims changes