Improve output behavior