Konstantin's review, first pass.