added plugins and rmeoved duplicate stuff