Improve output
Add monitor