Updated for event no.2