Modifications needed for FH processing (P.Morris)