New changes added as requested