Smooth out fanout logic
Add Artem to the team