Added Patch 1