Reworking FDR Optimizer