event assignment improvements