Added/removed some lines