Small event_incoming + Ninja roll Changes