End event + shuffle improvement