add flushing/reseting state that is residue from previous state
add flushing/reseting state that is residue from previous state

JonnyCE/project-platform,jtian0/project-platform,jtian0/project-platform,JonnyCE/project-platform,JonnyCE/project-platform,jtian0/project-platform