Finished the CR of CRUD.