Improvements on output result