full update before large re-organization