refactor activation controller