To 6.3
Handle deactivation and reactivation