Kiran's changes