More of the same ... reverted to multiple vars.