modification by Grzegorz during the discussion