refactors and audience target test