Updated output and calcs