Modified and added some files