A lot of changes to fitting and Efficiency