Less hardcoding in speaker