Added ability to not use assistant UI