Enable/disable functionality implemented