Improve the output
Update version