Properly update events; it totally works now