Changed listen logic