adjusted to changes on plugin