Adding state control and basic scores.