Added activate/deactiave methods