Updated Activation / Deactivation logic.