Dawid: further changes