merge gammel choices ind i ny struktur