Event arguments are now passed more sensibly