added plugins and such