improve plugin