Updated based on Joyce's comments