Build: David's comments