More updates based on feedback from Raynos.