catching the plugin up to the latest (better notes, slight refactor)