additional changes from Lars