Changes for FDE events