ES improvements