merging Nipun's changes