Retire another global in favour of adding a feature to the