Performce improve