changes in all the files as per requirements