Adding CV and APD calculations