Refactor to simplify
voice added