Changes for legacy spin analysis