Full commit, because there are missing files