I think Vasari and my code is now reconciled