Removing speaker dependency