Optimization Function Point Fitting Update

Final version