Improved state parameter generation