AV-1 made some changes in two files