Spare part modup

You may review the changes so that you can put this version online as recent version