Changes from Ivan.