Improving the version