Merged Swapna's code