Preliminary version for issue #4