deleted 2 and edited 1