Feature/reactivation

Please review and comment s appropraite