Changed some variables for outputs