merged and added .speaker class