added Kims changes