added patches from google group