Added and changed files
edited code