Incorporate Jonathan's feedback