Issue #42 , activate deactivate

@mnzaki @msameh93 @mennaamr @linabasheer Please review