More updates based on peer feedback.