Are still want to remove concurrent modification exception