Yurii' changes