Merging Karthik's changes