Further splitting apart of functionality; running again