Repair mostly working