refactor and add cases updated indicator