more plugin changes