Added way to disable feature