update logic of activation