Changes from Pavlo.