Added ability to disable point