Pshrestha: Merging Udeeb's changes