Updated to latest grapwalker