integrate good bits from other guides