Updates for FH2 and Commander Genius