Changed all remaining variables to array values.