Add back n-per-state

By popular request