Get back some of the vars that were lost in restructuring code