Changed some lines