Added new files
Modify code