more work on plugin and on differencing