add Jaakko's latest design. Fixes issue #2