A lot of changes to several files...