Added the rest of the activation logic