Still requires cleanup and lacks delete button change.