re-org of a lot of variables