make this work correctly and automatically for deletions