Made sure new set of variables is used everywhere