import Anne's changes to make Harald happier