update adressing Si comments (partly)