Revamping events system