update regarding Bjorn's suggestions