Can be simplified due to damaged item handling change