Events overhaul