updates to state system make benchmarking easier