Few extra bits from original commit