toward major refactoring of activity store, update core data