resolves merge conflict; done-updating logic out of views
resolves merge conflict; done-updating logic out of views

total-impact/total-impact-core,total-impact/total-impact-core,total-impact/total-impact-core,Impactstory/total-impact-core,Impactstory/total-impact-core,total-impact/total-impact-core,Impactstory/total-impact-core,Impactstory/total-impact-core