update & adapt to use fit results from macro 1