#164 Initial updates from a review with Vicky