Incremental output
Maually merged pull request