New update of esus, total rewrithe