went through Nilima's changes ... few minor changes