Completing some of the feedback from Ewan