new helper methods in State
clean up