Patch 3 Merge