Need to fix delete bugs