Added new patch. Updated setup to use patches rather than copying updated files