Grigory changes - 190113