updated with touch ups made at re:invent