moved more stuff to state