Edited some lines