Trying to fix variables

Should fix everything else