Should we include it by default? (without asking Scott?)