Changes after David's comments