[@Ariamis], ready for second review.