changes according to meeting 22.04.14