renamed globals and moved around redefs.