Added disable feature