Updated plug
A lot a changes