Modified some lines