Alexey Guzey updates

Updates from Alexey Guzey.