Modified files

I did modified some of the files.