Updated with Kendall's comments