changes as per aparajita's comments