Old changes forgot in ringsted branch