#8 - Updates from review