Add back n-per-state
Add back n-per-state
required
merge?