more patches contributed