Vasyl's changes restored again)