Changed after Henrik's notes