added enable/disable functionality