new plugin and a little formatting