Revised sketch for issues #205, #206 and part of #153.