new changes made as per email request