add all the variables that I'm actually trying to use (master)