[Skunkworks] Black Berry repair