Changed several files