#362 - More updates from review