Adding changes after feedback from Henrik