Improve 'modern' sendevent