Before merge. Changed a lot of files.