New patch with the recommended changes attached.