most changes done, still have few to go