Add extra output, remove circular references