fix performance. add delete.