Added modifications for endless data attacks