more structural adjustments ... checkpoint on upgrade doc
checkpoint