improved enable/disable monitoring