Incorporated changes from Vijaya
Merged Vijaya's changes