Changed order of variables being set