restructure running states