continuing work on plugin side