Updates as per Geraint's suggestions