Change to voices
Better interaction on the client
Remove duplication