#28 Activate Deactivate method added