No more  global (that was easy)