merge Vivek's changes