20221229 update by Mattias Almlöf