addon feature patch 10

I think it working fine