Merged Denis's last change