Moved away from globals