Changed to scalar variables. These are easier to overwrite.