Added delete and fixed add