missing bits from previous commit