Feature update from test.syddjurs.dk. Yanis changes.