Optimization Function files updated