changed several files