Made the changes provided by Kjell.