Enhancment: Updated for 0.10.17 and handled the patching better