Improve output system