reworked plugin calls