added plugin avoiding take 6