add the missing bits from the previous commit