manifest-refresh - begin refactor