made subject simpler again, just event_name + state_name