improve enable/disable monitoring