Complete ex 5 and 6. Approved by Anders