added disable functionality