merged file with new changes

merged file with new changes