some lines updated