added disable feature