Further developments to CV calculation