updated: reshuffle to committed structure for predominant server side rendering.