bug fixe and new find a way plugin introduction