Recommit of grapple logic