more changes from Lars