Updated to better handle the no-speaking situation