Added friendly enable/disable functions