modified and added some files