A quick update from Andrei, with a few additional notes