broken..., plugin changes