some lines changed