Nikolay's changes