Updated for taking the correct number of datapoints. Still need voice