Cleanup. Added auto-voice