#18 - Update from review