changes to Oppgave5