Updated and added some files