Rework PATCH section