Improved state/national transitions