Updated and added new files