add conditional event sending