Updated output variables, ready to test compile