PLugin almost completly integrated