Merging Hemendra's changes