Changes per David recommendations