MAJOR UPDATE: Recovery, flags et al.