incorporated comments from Bengt