Changes for restart events