update with current patches 6