[ANV] updated event numbering