add company scope and clunky activation