Caught some more variables