nitya's changes
merged conflicts