#1 - More updates from review