modified some lines