temp storage refactor