adapt to Yanas changes