Improve cv script