Vivek's changes added