Merging all updates from Kiran's branch