Added deletion, fixed marking