change variables to match