Issue #42 , activate deactivate

Issue #42
@mnzaki @msameh93 @mennaamr @linabasheer Please review