#23 before delete, I commit all