adding yngves changes?