First pass after David's comments