Improved version()