Updates
Actually, these must be cleaned
Remove my changes to cleanly apply only patch