Make it an option, not a default