merge in karthi's changes