Updates things
merges seth's things