refactored activate/disable calls