Dawid: initial final changes