change to actor per request pattern