Need to refactor delete and update still