Attempting more work on #26 will try tomorrow