Fixed insert & delete method