some change
lots of fitting changes