rebuild for more state info