Address  #321 (very early draft to make the stuff works)