Category: rework and repair